Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Nov 2011 08:45:58 +0000 (00:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Nov 2011 08:45:58 +0000 (00:45 -0800)

Trivial merge